* xsmfns.c (gdk_x11_set_sm_client_id) [!USE_GTK]: Don't define.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2cead634b241499f37305f6c5e2a33424dca6a54..7bbf1b218ff22326d035232ec96d65a340004376 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
        * xsmfns.c (create_client_leader_window): Rename shadowing arg.
        Remove unused var.
+       (gdk_x11_set_sm_client_id) [!USE_GTK]: Don't define.
 
        * xrdb.c (x_load_resources) [!USE_MOTIF]: Omit unused local.
 

diff --git a/src/xsmfns.c b/src/xsmfns.c
index 4a5d80b372a4168c586a86b61545708099668c89..c199036587f948e5d58aeaf7edf15c0cf7832090 100644 (file)
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -41,7 +41,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "process.h"
 #include "keyboard.h"
 
-#ifndef HAVE_GTK3
+#if defined USE_GTK && !defined HAVE_GTK3
 #define gdk_x11_set_sm_client_id(w) gdk_set_sm_client_id (w)
 #endif